diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js index 6e4f2f4ee..b225a2585 100644 --- a/web/pgadmin/browser/static/js/browser.js +++ b/web/pgadmin/browser/static/js/browser.js @@ -701,12 +701,18 @@ define('pgadmin.browser', [ } let get_menuitem_obj = function(_m) { + let enable = _m.enable; + if(_m.enable == '') { + enable = true; + } else if(_.isString(_m.enable) && _m.enable.toLowerCase() == 'false') { + enable = false; + } return new MenuItem({ name: _m.name, label: _m.label, module: _m.module, category: _m.category, callback: _m.callback, priority: _m.priority, data: _m.data, url: _m.url || '#', target: _m.target, icon: _m.icon, - enable: (_m.enable == '' ? true : (_.isString(_m.enable) && _m.enable.toLowerCase() == 'false') ? false : _m.enable), + enable, node: _m.node, checked: _m.checked, below: _m.below, }); }; diff --git a/web/pgadmin/browser/static/js/quick_search/trigger_search.js b/web/pgadmin/browser/static/js/quick_search/trigger_search.js index ecbcb77fd..d4d5cf81e 100644 --- a/web/pgadmin/browser/static/js/quick_search/trigger_search.js +++ b/web/pgadmin/browser/static/js/quick_search/trigger_search.js @@ -12,6 +12,32 @@ import {onlineHelpSearch} from './online_help'; import {menuSearch} from './menuitems_help'; import $ from 'jquery'; import gettext from 'sources/gettext'; +import PropTypes from 'prop-types'; + +function HelpArticleContents({isHelpLoading, isMenuLoading, helpSearchResult}) { + return (isHelpLoading && !isMenuLoading) ? ( +